Switched away from using Sugar
Removed unneccessary check