Revert "Commit old code"

This reverts commit 495d37ec8e984ebfa11a740c1db763c5dcebe3e8.