Merge origin/master

Fixed conflicts with Local Branch bro. Also removed some imports which were not necessary.