Code Cleanup. Also fixed a bug with Dislocation focus blacklist