further removal of unused functions