Removed all hardcoded shizzle