Removed commented sections for other use case