Code/build cleanup