Build cleanup, take 2