Not needed anymore
Massive code clean up