removed extra stuff that is not used