cleaned up unwanted features and fixed the bug

I introduced unwanted features, to fix the bug I just removed them