Clean up on code to fix Ghost block (still WIP)