Removed left-over stuffs