Remove folder static
More cleanup