Got rid of outdated type constraints