Build and constant cleanup

(Logical change 1.6)
1 file changed