Removed unnecessary certificates + refactoring