Build clean-ups