Removed & disabled old code