Removed un-needed struct