Whitespace fix

Signed-off-by: John Rayes <live627@gmail.com>
Removing some old, broken code

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1612 from live627/oldcode

Removing some old, broken code