removed excessive functionality