Removed custom dead code