Removed all unneccarries