removed comments, removed unused fonction