Removed dead code
Fixed name collision