Clean some function declarations