General Cleanup

General cleanup of files.