Made the app buildable by removing bad code