cleaned up admin resources for 4.2

this pull consists of 10 commits, each shows in a simple way the changes with a message that makes it easier to review.  please see the different commits for details.