Removed Bungee Stuff, Cleaned Code

Removed Bungee Stuff, Cleaned Code