Cleaned up code cruft