Reduce code-basis significantly