Cleaned old code