IC2 Clean Up (One of many to come)