Cleanup too lazy to do it in manifest