Removed redundant stuffs