Remove build and contrib dirs
Misc update