Removed old finatra implementaion