Removed nonsense code, that I should have check more in details before merging m(