some admin proposals
some cleanup