removing unneccessary function