code cleanup, removed garbage