Removed geiger dependency