Excess code removed