Remove un-used code