removing an unecessary call and function