Comment code and delete some useless snippets