Removed un-needed stuffs