cleaning more stuff up