excess code removed