Removed more uneccessary conversions