Removed unneeded castings