More Indentation Fixes
Remove previously removed class