Cleaned up legacy quest code