clean up unused helpers and features