Gutted some stuff