Removed deprecated loading of yaml, cleaned up permissions checking