Clean up code

I did some cleanup in the issue fork, but should be noted that (per existing issues) the RulesAction plugin has a lot of real errors since it is using functions that don't exist, etc. These will not be addressed in this issue.