Code cleanup. Added stub files for other modals