Remove never used code