Update: remove unneeded stuff