READY: remove useless specs and refactor some codes