Removed fragments from refactor