diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index c1ad718d..effe56be 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -64,8 +64,6 @@ angular.module('passmanApp')
 					_credentials.push(credential);
 				}
 				$scope.credentials = _credentials;
-
-				//@Todo: Set last accessed
 			});
 		};
 
diff --git a/js/app/controllers/edit_credential.js b/js/app/controllers/edit_credential.js
index e5847d5f..e5adbe6f 100644
--- a/js/app/controllers/edit_credential.js
+++ b/js/app/controllers/edit_credential.js
@@ -131,7 +131,6 @@ angular.module('passmanApp')
 			FileService.deleteFile(file).then(function () {
 				$scope.storedCredential.files.splice(idx, 1);
 			});
-			//@TODO Delete file
 		};
 
 		$scope.fileLoaded = function (file) {
diff --git a/js/app/controllers/vault.js b/js/app/controllers/vault.js
index 1591cf69..3ff4d45f 100644
--- a/js/app/controllers/vault.js
+++ b/js/app/controllers/vault.js
@@ -123,7 +123,6 @@ angular.module('passmanApp')
 				test_credential.password = 'lorum ipsum';
 				CredentialService.createCredential(test_credential).then(function (result) {
 					_loginToVault(vault, vault_key);
-					//@TODO Redirect to newly created vault
 				})
 			});
 		};
diff --git a/js/app/directives/fileselect.js b/js/app/directives/fileselect.js
index 913d275b..187863a9 100644
--- a/js/app/directives/fileselect.js
+++ b/js/app/directives/fileselect.js
@@ -52,7 +52,7 @@ angular.module('passmanApp')
 					//Now load the files
 					for (var i = 0; i < e.target.files.length; i++) {
 						_currentFile = e.target.files[i];
-						var mb_limit = 2000; //@TODO remove this after test (Set to 2mb)
+						var mb_limit = 5;
 						if (_currentFile.size > (mb_limit * 1024 * 1024)) {
 							scope.error('TO_BIG', _currentFile);
 						}
diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js
index fa7e73bc..9f731ed3 100644
--- a/js/app/services/credentialservice.js
+++ b/js/app/services/credentialservice.js
@@ -17,7 +17,7 @@ angular.module('passmanApp')
 			'description': null,
 			'created': null,
 			'changed': null,
-			'tags': null,
+			'tags': null, //2TODO Dit moet nog gemaakt worden
 			'email': null,
 			'username': null,
 			'password': null,
diff --git a/lib/Db/FileMapper.php b/lib/Db/FileMapper.php
index 18e2c1a4..d5d49957 100644
--- a/lib/Db/FileMapper.php
+++ b/lib/Db/FileMapper.php
@@ -50,6 +50,6 @@ class FileMapper extends Mapper {
 		$file = new File();
 		$file->setId($file_id);
 		$file->setUserId($userId);
-		$this->delete($file); // TODO: Change the autogenerated stub
+		$this->delete($file);
 	}
 }
\ No newline at end of file