cleanup & experimental mode