Cleaned up some class state where it was not required.