Removed some reudndant code