remove messy code