More cleaning up. hehe