Removed all the trusty hacks since we are building on trusty