BUG: Removed dead code