cleaned up code cruft