Removed code that could cause runtime errors