Removed all code in preperation for re-vamp of the framework