Remove an overcomplicated approach