More cleanup

Removing unused items and code