Removing unecessary code and now transitioning to new functions