Removed old app layer and related tests