removed non neccessary code