Cleaned up old, commented-out code no longer in use