Fix excessive code