Removed usage of constantize
Removed legacy conditional