Bugfix: Readded some deletions of the last commit