massive cleanup makes the builds work better.