Remove trash
Fix namespace
Comment upgrade step