Removed more lipis' crap