Removal of useless crap

Useless crap was removed
Cleaned solution