remove the messy code