Add diminsh mode
Cleanup packages