Merge "profcollectd: Clean up dead code"