added cleanup stuff