Remove catapult references