Cleaned up some files and references