Remove old, commented out code and clean up a few lines
Change source_type -> sourceType in BuildA.m