Remove comments, fix  issue #22 and reverted DB