removed annoying extra stuffs