housekeeping, removed unused imports, commented out future functionality