Cleaned up old strategy