Finish up leftover & pending tests
Delete a few things
Merge branch 'put-security' into develop