1. Add focus support.
2. Remove unused code and files.