Removed pieces that were not needed anymore

- according to comments from review