Fixed Build Bugs
Cleaned File