Changes to size and excess code