[cleanup] Removed leftovers