Removing Eclipse warnings again