Removed some superfluous codes