Removed more stuffs