Removed unused bean wrapper functionality, more code cleanup in validator