grunt/build simplification + cleanup