Removed leftovers