cleaned Graphics and Engine