cleaned up unnecesary references