Removed ugly hacks, removed static