Merge with Jakub project
Remove unused code