Removed some constnesses