Revert "We clean a bit up our features"

This reverts commit 1c31db09e4bfc7ca4e2faccaa24d7a3f31c0679c.