change wording for define
remove devel workaround stuff