removed unused code
updated migrations
updated migrations