Build file cleanup
More build file cleanup