Removed additional unused schemas