Further cleaned up files