massive cleanup now that we have a proper SBT build