Cleaned up files

Changes for security and for simplicity