diff --git a/mayan/apps/documents/admin.py b/mayan/apps/documents/admin.py
index 9c15c4b539..e7af74a959 100644
--- a/mayan/apps/documents/admin.py
+++ b/mayan/apps/documents/admin.py
@@ -20,9 +20,6 @@ class DocumentVersionInline(admin.StackedInline):
     extra = 1
     classes = ('collapse-open',)
     allow_add = True
-    # inlines = [
-    #    DocumentPageInline,
-    # ]
 
 
 class DocumentTypeFilenameInline(admin.StackedInline):
diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py
index 50da37036f..f2358ba0c0 100644
--- a/mayan/apps/metadata/forms.py
+++ b/mayan/apps/metadata/forms.py
@@ -17,7 +17,6 @@ class MetadataForm(forms.Form):
         # Set form fields initial values
         if 'initial' in kwargs:
             self.metadata_type = kwargs['initial'].pop('metadata_type', None)
-            # self.document_type = kwargs['initial'].pop('document_type', None)
 
             # FIXME:
             # required = self.document_type.documenttypemetadatatype_set.get(metadata_type=self.metadata_type).required
@@ -71,7 +70,6 @@ class MetadataRemoveForm(MetadataForm):
 
 class MetadataSelectionForm(forms.Form):
     def __init__(self, *args, **kwargs):
-        # document_type = kwargs.pop('document_type', None)
         super(MetadataSelectionForm, self).__init__(*args, **kwargs)
         document_type = getattr(self, 'initial', {}).get('document_type', None)
         if document_type:
@@ -86,7 +84,6 @@ class MetadataSelectionForm(forms.Form):
         queryset=MetadataSet.objects.all(),
         label=_(u'Metadata sets'),
         required=False,
-        # widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
         widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
     )
 
@@ -94,7 +91,6 @@ class MetadataSelectionForm(forms.Form):
         queryset=MetadataType.objects.all(),
         label=_(u'Metadata'),
         required=False,
-        # widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
         widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
     )
 
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index 39d498fec2..a5be503a7b 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -115,7 +115,6 @@ def permission_grant(request):
 
     items = []
     for item_properties in items_property_list:
-        # permission = get_object_or_404(Permission, pk=item_properties['permission_id'])
         try:
             permission = Permission.objects.get({'pk': item_properties['permission_id']})
         except Permission.DoesNotExist:
@@ -178,7 +177,6 @@ def permission_revoke(request):
 
     items = []
     for item_properties in items_property_list:
-        # permission = get_object_or_404(Permission, pk=item_properties['permission_id'])
         try:
             permission = Permission.objects.get({'pk': item_properties['permission_id']})
         except Permission.DoesNotExist:
@@ -286,8 +284,6 @@ def get_non_role_members(role):
     if anonymous:
         non_members.append((_(u'Special'), _as_choice_list(list(anonymous))))
 
-    # non_holder_list.append((_(u'Special'), _as_choice_list([AnonymousUserSingleton.objects.get()])))
-
     return non_members
 
 
@@ -307,9 +303,7 @@ def role_members(request, role_id):
 
     return assign_remove(
         request,
-        # left_list=lambda: generate_choices_w_labels(get_non_role_members(role)),
         left_list=lambda: get_non_role_members(role),
-        # right_list=lambda: generate_choices_w_labels(get_role_members(role)),
         right_list=lambda: get_role_members(role),
         add_method=lambda x: add_role_member(role, x),
         remove_method=lambda x: remove_role_member(role, x),
diff --git a/mayan/apps/sources/models.py b/mayan/apps/sources/models.py
index 70b71628e6..edd17bdcb3 100644
--- a/mayan/apps/sources/models.py
+++ b/mayan/apps/sources/models.py
@@ -112,12 +112,7 @@ class BaseModel(models.Model):
         if not new_version_data:
             new_version_data = {}
 
-        try:
-            new_version = document.new_version(file=file_object, user=user, **new_version_data)
-        except Exception:
-            # Don't leave the database in a broken state
-            # document.delete()
-            raise
+        new_version = document.new_version(file=file_object, user=user, **new_version_data)
 
         if filename:
             document.rename(filename)
@@ -268,7 +263,6 @@ class SourceTransformation(models.Model):
     transformations = SourceTransformationManager()
 
     def __unicode__(self):
-        # return u'"%s" for %s' % (self.get_transformation_display(), unicode(self.content_object))
         return self.get_transformation_display()
 
     class Meta: