Develop

- Bug fixes.
- Code cleanup.
- Remove dependencies.