trying to clean stuff up