[aur-dev] [PATCH 1/2] Remove legacy code