Bugfix

• Fix console complain when afterDone is not provided
• Remove a ton of duplicated codes (don't know why it's there at the first place)