A few optimization changes

Now with less removing things for future use!