Removing performance-measurements