Security not working
remove complex security and refactor