Cleanup: Removed previous structure.