code clean-up and removed django1.5 fix (conflicts with other apps)