Removed x and y member variables