cleaned up demo core