Removed unneeded complexity