Cleaned up files for master merge