- Cleaned up code
- Fixed problem with return value when connecting and disconnecting
- Removed UI screens that are not needed