cleaned up a lot of leftover crud