Remove hacks to make it work on my account