Clean up code (remove unneded functions)