Fixed thinks not getting cleaned up