get rid of unessecary functions