remover unecessary code
remover unecessary code