finalized for merge; removed unecessary assets