Removed build directories and further cleanup