Removed cruft, old comments, bad code