code cleanup, removed old checks