cleanup of app/** + unitests