Further code space cleaning