removed some hackery