TODO: Remove some items that are already done