1. Remove comments and redudndant code.
2. Fixed entry on test page