Clean up of unused files and fix validation error with datetime