Removed unecessary validation components