Cleaned up old commands