Added updated model validation and cleaned up files