Fixes and Clean-ups from Euphy for Wolfchev's Lab.
Removed redundants