Cleaned up work in progress mess