I believe this can be removed as well