Removed template-function