Django 1.6 and some cleaning.