Fix #36 anhanced backend functionalities

Don't keep commented code. Please remove it.