Removed more magic strings