Fixed Build and cleanup