clean up, remove extra contrib dir