remove deprecated functionality
fix syntax issue
remove deprecated functions