remove calls to user-based functions
more polish