Further cleanup and buildable status