Clean up Simulation

Change-Id: If1217dea16bacc1431b79bbc5872215ff8b72283
Signed-off-by: Tobias <pahlings@gmail.com>