Removing some unwanted stuff

removing certain unwanted stuff to keep the module simple and coherent