Cleanup & now using Artemis Entity-System framework.