Removed third party crap