Removing deprecated API usage