Massive code simplification