Removed stuff for bug hunting