Removed some magic strings and controls