class 29 & general cleanup