First draft with security
Remove unused files