Revert "New code"

This reverts commit f2a3768ea260a80910cc0916a2e71a520dcc7e93.