Cleanup - removed useless functions