Better security & cleanup of unused things