cleanup rest API issues