Remove Under and Fix apach bug