More removal of stuff