Clean util classes