Fixed shadowing
Changelog added
Removed unnecessary file