Cleaning up Abstract Repository