Cleaned up asset pipeline