took out excess code