cleanup excess code