Clean up + removed broken perf module