Cleanups

Continuing the cleanup process...