removing all logic