Removing a hardcoded variable