Removed unused code + fixes from PR comments