Finished reverting things

Fixed instances where lists remained