Commit after moving off duplicate code in controlers to common