remove old commented code + revert some changes from previous commit