Cleaned up core file. Removed old unit test stuff.