Removing unecessary commands and functions