Clean up and remove the unnecessary builder modules