Gen 1: Remove unnecessary code