Cleaned up and/or removed extraneous code

Added the missing ParameterValidator.java from the last commit as well.