Removed deadcode