1. remove unused modules
2. add modules for singin