Remove under and Fix apach bug