removed redundant/unreachable returns, else branches, type declarations, unused variables
Co-authored-by: AlteredCoder Co-authored-by: erenJag