Removed static constants