Removed configuration stuff