Move static variables to instance variables. Add finalize methods. Remove code
that is commented out. Cleanup locking code.