Taking some more stuff out of plugins.php

Went into extras.php