Removed unused vals