Fixed lots of warnings (mostly redundant code)

Most of the changes here were done by Eclipse's Quick Fix thing
Should this be indented?