We can take this out completely