Moved methods to beginning of source file.
Cleane up cleanup:cruft task.
Clean up bunch of things.