Last cleanup part4