Move odd stuff to models