Removed unused code.
Moved modals to individual files.