fixes for func signatures
remove unnecess
de-duplication