Cleaning up the App and removed junk code