Cleaned up dead code, removed demo file.