PuP Office Clean up