Removed old files, added indexes and validation