Shaved off a few lines

Lets hope this won't be needed anymore at one point :*(