diff --git a/src/display/animation/queue.c b/src/display/animation/queue.c
index 47d9f8be..f1a9e116 100644
--- a/src/display/animation/queue.c
+++ b/src/display/animation/queue.c
@@ -47,9 +47,9 @@ queueaction_t * queueAdd(queue_t *queue) {
   return action;
 }
 
-void queueUpdate(queue_t *queue, engine_t *engine) {
+void queueUpdate(queue_t *queue, float delta) {
   queueaction_t *action;
-  queue->timeline += engine->time.delta;
+  queue->timeline += delta;
   if(queue->current >= queue->count) return;
 
   action = queue->items + queue->current;
diff --git a/src/display/animation/queue.h b/src/display/animation/queue.h
index a24c6338..a53a1282 100644
--- a/src/display/animation/queue.h
+++ b/src/display/animation/queue.h
@@ -8,7 +8,6 @@
 #pragma once
 #include "../../libs.h"
 #include "../../util/array.h"
-#include "../../engine/engine.h"
 
 #define ANIMATION_QUEUE_ITEM_MAX 128
 #define ANIMATION_QUEUE_START 0xFF
@@ -82,9 +81,9 @@ queueaction_t * queueAdd(queue_t *queue);
 /**
  * Updates the queue logic.
  * @param convo Queue to update.
- * @param engine Engine used to update.
+ * @param delta Time delta to tick the queue by.
  */
-void queueUpdate(queue_t *queue, engine_t *engine);
+void queueUpdate(queue_t *queue, float delta);
 
 /**
  * Dispose the queue when finished.
diff --git a/src/display/framebuffer.c b/src/display/framebuffer.c
index 5941113e..8ac44f3e 100644
--- a/src/display/framebuffer.c
+++ b/src/display/framebuffer.c
@@ -58,9 +58,9 @@ void frameBufferResize(framebuffer_t *frameBuffer,int32_t width,int32_t height){
   frameBufferInit(frameBuffer, width, height);
 }
 
-void frameBufferUnbind(render_t *render, bool clear) {
+void frameBufferUnbind(float viewWidth, float viewHeight, bool clear) {
   glBindFramebuffer(GL_FRAMEBUFFER, 0);
-  glViewport(0, 0, (GLsizei)render->width, (GLsizei)render->height);
+  glViewport(0, 0, (GLsizei)viewWidth, (GLsizei)viewHeight);
 
   if(clear) {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
diff --git a/src/display/framebuffer.h b/src/display/framebuffer.h
index 77393192..598e6f9e 100644
--- a/src/display/framebuffer.h
+++ b/src/display/framebuffer.h
@@ -8,7 +8,6 @@
 #pragma once
 #include "../libs.h"
 #include "texture.h"
-#include "render.h"
 
 typedef struct {
   GLuint fboId;
@@ -46,10 +45,11 @@ void frameBufferResize(framebuffer_t *frameBuffer,int32_t width,int32_t height);
 /**
  * Unbind the currently bound frame buffer.
  * 
- * @param render Render manager
+ * @param viewWidth Viewport width.
+ * @param viewHeight Viewport height.
  * @param clear Whether or not to clear the back buffer.
  */
-void frameBufferUnbind(render_t *render, bool clear);
+void frameBufferUnbind(float viewWidth, float viewHeight, bool clear);
 
 /**
  * Dispose/cleanup a previously created frame buffer.
diff --git a/src/display/render.c b/src/display/render.c
index 0293a0cb..8801c3aa 100644
--- a/src/display/render.c
+++ b/src/display/render.c
@@ -24,7 +24,7 @@ void renderInit() {
 
 void renderFrameStart(render_t *render) {
   // Clear the frame buffer.
-  frameBufferUnbind(render, true);
+  frameBufferUnbind(render->width, render->height, true);
 }
 
 void renderDispose() {
diff --git a/src/engine/engine.c b/src/engine/engine.c
index 864fda25..90c42a0b 100644
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -7,19 +7,19 @@
 
 #include "engine.h"
 
-void engineInit(engine_t *engine, game_t *game) {
+void engineInit(engine_t *engine) {
   epochInit(&engine->time);
   renderInit();
   inputInit(&engine->input);
 }
 
-void engineUpdateStart(engine_t *engine, game_t *game, float delta) {
+void engineUpdateStart(engine_t *engine, float delta) {
   epochUpdate(&engine->time, delta);
   inputUpdate(&engine->input);
   renderFrameStart(&engine->render);
 }
 
-bool engineUpdateEnd(engine_t *engine, game_t *game) {
+bool engineUpdateEnd(engine_t *engine) {
   if(inputIsPressed(&engine->input, INPUT_NULL)) {
     printf("Game exit requested\n");
     return false;
@@ -27,7 +27,7 @@ bool engineUpdateEnd(engine_t *engine, game_t *game) {
   return true;
 }
 
-void engineDispose(engine_t *engine, game_t *game) {
+void engineDispose(engine_t *engine) {
   inputDispose(&engine->input);
   renderDispose();
 }
\ No newline at end of file
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 03a9b054..f68e68f9 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -7,7 +7,6 @@
 
 #pragma once
 #include "../libs.h"
-#include "../game/game.h"
 #include "../input/input.h"
 #include "../epoch/epoch.h"
 #include "../display/render.h"
@@ -28,31 +27,27 @@ typedef struct {
  * managers for the game to use.
  * 
  * @param engine Engine to initialize.
- * @param game Game that intiialized this engine.
  */
-void engineInit(engine_t *engine, game_t *game);
+void engineInit(engine_t *engine);
 
 /**
  * Updates the given engine at the start of a frame.
  * 
  * @param engine Engine that is being updated
- * @param game Game that initialized the engine update
  * @param delta Delta tick provided by the game's platform.
  */
-void engineUpdateStart(engine_t *engine, game_t *game, float delta);
+void engineUpdateStart(engine_t *engine, float delta);
 
 /**
  * Updates the given engine at the end of a frame.
  * 
- * @param engine Engine to update.
- * @param game Game that called this update.
+ * @param engine Engine to update. 
  */
-bool engineUpdateEnd(engine_t *engine, game_t *game);
+bool engineUpdateEnd(engine_t *engine);
 
 /**
  * Cleanup the engine context.
  * 
  * @param engine Engine to clean up.
- * @param game Game that initialized the cleanup.
  */
-void engineDispose(engine_t *engine, game_t *game);
\ No newline at end of file
+void engineDispose(engine_t *engine);
\ No newline at end of file