Removed legacy code from django branch.