- Fixing the way we are handling startup
- Removing flags, we don't use / need them