Removed some casting