[FIX] Unnecessary stuff according to PR comments