code cleanup
removed unused functions