cleaning up more crud