code cleanup, removed true