Excessive code is removed