Bug Fixes & Clean Up

- Fixed some things not running properly
- Removed unnecessary files