Remove code excess