cs fixes and deprecated methods removed