Prepear to merge with linda
Removed som junk