cleanup and remove general function
including the base and removing duplicate options and function
cleaning up and removing general function