code cleanup, removed unnecessary methods from UI layer