Pushing some proxy-functions to the layouts
Removed two files that are no longer required