Kill indentation

Obviously no tabs were harmed during the process.
Remove dead code