Removed some reduntant code