make assets working and cleanup