Removed usage of deprecated constants