Fix #36 anhanced backend functionalities new2

Don't keep commented code.