Fix a few issues and delete extraneous files