Commented out unused variables/imports