Removed LPI leftovers..