Removed extra config stuff