Remove old code which make Problems