Removed some unused variables. Updated copyright info