Cleaned up old files, merge mistakes