Bricks prefub materials fixed, more cleanup