Removed constants from header