Fixed an itsy bitsy bug
Cleaned up some unneeded stuff