Removed some old and unused code without breaking the app