removed some stupid logic :/