Cleaning out some Deadcode
Removing trailing whitespace