Removed unused functions
Merge branch 'master' into ComponentViews
Temporary rename for case-sensitive rename
Renamed to differen case