Remove test, unnecessary code
Put code back