Fixed reference removing