Remove excess code