Some cleanup
Dummy verification. + more cleanup