Yaniv changes

Remove those, they are not needed for now.