Remove unused, update currently used