Revert "Revert "Started to take stuff away""

This reverts commit abed75b9b1e98108b904cd881e80e60f5a5ded16.