Simplify deps + remove unnecessary backward compatibilities (checked with AMO)