Cleared fight of useless code
Cleared fight of useless code