code cleanup, removed old unnecessary methods