Adds custom function validator, cleans up some unused clutter