Unchained some actions - do not preload large collections of data
Remove redundant file