Cleaned up logic files -- removed unused variables