Removing unneeded special handling from application