Remove separation between stateful and stateless components

We probably will take this back when we are going to be ready with components
handles API.