Remove/mark some unused functions and parameters