Removed redundant(?) code