ATrappmann Version 1.8.1 - cleanup