AGSMPLPUSH-48 "Code cleanup"