cleanup
first pass at product maitenance complete