Clean up

General clean up of files, code.