Actually committed previously-mentioned changes
cleanup