Some cleanup added static middleware