diff --git a/src/drawing/rect.c b/src/drawing/rect.c
index a410d2309d..297dafd849 100644
--- a/src/drawing/rect.c
+++ b/src/drawing/rect.c
@@ -160,7 +160,6 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
 	if (colour & 0x8000000){
 		//0x8000000
 		// 00678B3A    00678EC9 still to be implemented
-		//RCT2_CALLPROC_X(0x00678AD4, left, right, top, bottom, 0, dpi, colour);
 		int esi = left - RCT2_GLOBAL(0x1420070,sint16);
 		RCT2_GLOBAL(0xEDF824,uint32) = esi;
 		esi = top - RCT2_GLOBAL(0x1420072,sint16);
@@ -223,7 +222,6 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
 		memset(dest_pointer, (colour & 0xFF), width);
 		dest_pointer += dpi->width + dpi->pitch;
 	}
-	// RCT2_CALLPROC_X(0x00678AD4, left, right, top, bottom, 0, dpi, colour);
 }
 
 /**
diff --git a/src/drawing/sprite.c b/src/drawing/sprite.c
index edadd6ece4..74ac99a29b 100644
--- a/src/drawing/sprite.c
+++ b/src/drawing/sprite.c
@@ -394,9 +394,6 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
  */
 void gfx_draw_sprite(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint32 tertiary_colour)
 {
-	//RCT2_CALLPROC_X(0x0067A28E, 0, image_id, x, y, 0, (int)dpi, tertiary_colour);
-	//return;
-
 	int image_type = (image_id & 0xE0000000) >> 28;
 	int image_sub_type = (image_id & 0x1C000000) >> 26;
 
@@ -487,20 +484,6 @@ void gfx_draw_sprite_palette_set(rct_drawpixelinfo *dpi, int image_id, int x, in
 		g1_source = &g2.elements[image_element - SPR_G2_BEGIN];
 	}
 
-	//Zooming code has been integrated into main code.
-	//if (dpi->zoom_level >= 1){ //These have not been tested
-	//	//something to do with zooming
-	//	if (dpi->zoom_level == 1){
-	//		RCT2_CALLPROC_X(0x0067A28E, 0, image_id, x, y, 0, (int)dpi, 0);
-	//		return;
-	//	}
-	//	if (dpi->zoom_level == 2){
-	//		RCT2_CALLPROC_X(0x0067DADA, 0, (int)g1_source, x, y, 0, (int)dpi, 0);
-	//		return;
-	//	}
-	//	RCT2_CALLPROC_X(0x0067FAAE, 0, (int)g1_source, x, y, 0, (int)dpi, 0);
-	//	return;
-	//}
 	if ( dpi->zoom_level && (g1_source->flags & (1<<4)) ){
 		rct_drawpixelinfo zoomed_dpi = {
 			.bits = dpi->bits,
diff --git a/src/editor.c b/src/editor.c
index ada8445aa8..58e25e0cbf 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -342,9 +342,6 @@ static int editor_read_s6(const char *path)
 	rct_s6_header *s6Header = (rct_s6_header*)0x009E34E4;
 	rct_s6_info *s6Info = (rct_s6_info*)0x0141F570;
 
-	// strcpy((char *)0x0141EF68, path);
-	// RCT2_CALLPROC_EBPSAFE(0x006758FE);
-
 	log_verbose("loading landscape, %s", path);
 
 	file = fopen(path, "rb");
@@ -425,8 +422,6 @@ static int editor_read_s6(const char *path)
 			set_load_objects_fail_reason();
 			return 0;
 		}
-		// Check expansion pack
-		// RCT2_CALLPROC_EBPSAFE(0x006757E6);
 
 		reset_loaded_objects();
 		map_update_tile_pointers();
diff --git a/src/game.c b/src/game.c
index c64045e49e..817955b3ef 100644
--- a/src/game.c
+++ b/src/game.c
@@ -223,7 +223,6 @@ void game_update()
 	redraw_peep_and_rain();
 
 	// 0x006E3AEC // screen_game_process_mouse_input();
-	// RCT2_CALLPROC_EBPSAFE(0x006E3AEC); // screen_game_process_keyboard_input();
 	screenshot_check();
 	game_handle_keyboard_input();
 
@@ -665,9 +664,6 @@ int game_load_save(const char *path)
 
 	fclose(file);
 
-	// Check expansion pack
-	// RCT2_CALLPROC_EBPSAFE(0x006757E6);
-
 	if (!load_success){
 		set_load_objects_fail_reason();
 		if (RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_5){
diff --git a/src/input.c b/src/input.c
index 9d4ce11c6b..0015fda1d3 100644
--- a/src/input.c
+++ b/src/input.c
@@ -151,27 +151,7 @@ static void game_get_next_input(int *x, int *y, int *state)
 	*y = eax->y;
 	*state = eax->state;
 
-	//int eax, ebx, ecx, edx, esi, edi, ebp;
-	//RCT2_CALLFUNC_X(0x006E83C7, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
-	//*x = eax & 0xFFFF;
-	//*y = ebx & 0xFFFF;
-	//*state = ecx & 0xFF;
-	//return;
-
-	//int on_tutorial = RCT2_GLOBAL(RCT2_ADDRESS_ON_TUTORIAL, uint8);
-	//if (RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_5) {
-	//	if (on_tutorial == 1) {
-
-	//	} else {
-	//		RCT2_CALLPROC_EBPSAFE(0x00407074);
-	//	}
-	//	if (on_tutorial == 2) {
-
-	//	}
-
-	//} else {
-
-	//}
+	// NOTE this function lacks tutorial logic
 }
 
 /**
@@ -266,7 +246,6 @@ static void game_handle_input_mouse(int x, int y, int state)
 		input_state_widget_pressed(x, y, state, widgetIndex, w, widget);
 		break;
 	case INPUT_STATE_VIEWPORT_LEFT:
-		//RCT2_CALLPROC_X(0x006E87B4, x, y, state, widgetIndex, (int)w, (int)widget, 0);
 		w = window_find_by_number(
 			RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_WINDOWCLASS, rct_windowclass),
 			RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_WINDOWNUMBER, rct_windownumber)
@@ -1081,7 +1060,6 @@ static void input_update_tooltip(rct_window *w, int widgetIndex, int x, int y)
 			}
 
 			window_tooltip_open(w, widgetIndex, x, y);
-			// RCT2_CALLPROC_X(0x006EA10D, x, y, 0, widgetIndex, w, widget, 0); // window_tooltip_open();
 		}
 	}
 	else {
diff --git a/src/interface/viewport.c b/src/interface/viewport.c
index 47fde16886..1e80145552 100644
--- a/src/interface/viewport.c
+++ b/src/interface/viewport.c
@@ -224,10 +224,6 @@ void viewport_create(rct_window *w, int x, int y, int width, int height, int zoo
 	viewport->view_y = view_y;
 
 	viewport_update_pointers();
-
-	//x &= 0xFFFF;
-	//y &= 0xFFFF;
-	//RCT2_CALLPROC_X(0x006EB009, (y << 16) | x, (height << 16) | width, zoom, edx, (int)w, 0, 0);
 }
 
 /**
@@ -253,8 +249,6 @@ void viewport_update_pointers()
  */
 void sub_689174(sint16* x, sint16* y, sint16 *z)
 {
-	//RCT2_CALLFUNC_X(0x00689174, (int*)&x, (int*)&y, (int*)&z, &curr_rotation, (int*)&window, (int*)&viewport, &ebp);
-
 	sint16 start_x = *x;
 	sint16 start_y = *y;
 	sint16 height = 0;
@@ -315,7 +309,6 @@ void sub_689174(sint16* x, sint16* y, sint16 *z)
 //}
 
 void sub_6E7F34(rct_window* w, rct_viewport* viewport, sint16 x_diff, sint16 y_diff){
-	//RCT2_CALLPROC_X(0x6E7F34, 0, 0, 0, x_diff, (int)viewport, (int)w, y_diff);
 	rct_window* orignal_w = w;
 	int left = 0, right = 0, top = 0, bottom = 0;
 
@@ -351,8 +344,6 @@ void sub_6E7F34(rct_window* w, rct_viewport* viewport, sint16 x_diff, sint16 y_d
 }
 
 void sub_6E7DE1(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport){
-	//RCT2_CALLPROC_X(0x6E7DE1, x, y, 0, 0, w, viewport, 0);
-	//return;
 	uint8 zoom = (1 << viewport->zoom);
 
 	// Note: do not do the subtraction and then divide!
@@ -420,7 +411,6 @@ void sub_6E7DE1(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport){
 	}
 
 	sub_6E7F34(w, viewport, x_diff, y_diff);
-	//RCT2_CALLPROC_X(0x6E7F34, 0, 0, 0, x_diff, (int)viewport, (int)w, y_diff);
 
 	memcpy(viewport, &view_copy, sizeof(rct_viewport));
 }
@@ -452,8 +442,6 @@ void viewport_set_underground_flag(int underground, rct_window* window, rct_view
  */
 void viewport_update_position(rct_window *window)
 {
-	//RCT2_CALLPROC_X(0x006E7A3A, 0, 0, 0, 0, (int)window, 0, 0);
-
 	RCT2_CALLPROC_X(window->event_handlers[WE_RESIZE], 0, 0, 0, 0, (int)window, 0, 0);
 
 	rct_viewport* viewport = window->viewport;
@@ -466,13 +454,11 @@ void viewport_update_position(rct_window *window)
 		int underground = sprite->unknown.z < height;
 
 		viewport_set_underground_flag(underground, window, viewport);
-		//RCT2_CALLPROC_X(0x6E7A15, sprite->unknown.x, sprite->unknown.y, sprite->unknown.z, underground, (int)window, (int)viewport, 0);
 
 		int center_x, center_y;
 		center_2d_coordinates(sprite->unknown.x, sprite->unknown.y, sprite->unknown.z, &center_x, &center_y, window->viewport);
 
 		sub_6E7DE1(center_x, center_y, window, viewport);
-		//RCT2_CALLPROC_X(0x6E7DE1, center_x, center_y, 0, 0, (int)window, (int)viewport, 0);
 		return;
 	}
 
@@ -484,7 +470,6 @@ void viewport_update_position(rct_window *window)
 	sub_689174(&x, &y, &z);
 
 	viewport_set_underground_flag(0, window, viewport);
-	//RCT2_CALLPROC_X(0x006E7A15, x, y, z, 0, (int)window, (int)viewport, 0);
 
 	//Clamp to the map minimum value
 	int at_map_edge = 0;
@@ -565,7 +550,6 @@ void viewport_update_position(rct_window *window)
 	}
 
 	sub_6E7DE1(x, y, window, viewport);
-	//RCT2_CALLPROC_X(0x6E7DE1, x, y, 0, 0, (int)window, (int)viewport, 0);
 }
 
 /**
@@ -675,8 +659,6 @@ void paint_attached_ps(paint_struct* ps, paint_struct* attached_ps, rct_drawpixe
 }
 
 void sub_688485(){
-	//RCT2_CALLPROC_EBPSAFE(0x688485);
-	//return;
 	rct_drawpixelinfo* dpi = RCT2_GLOBAL(0x140E9A8, rct_drawpixelinfo*);
 	paint_struct* ps = RCT2_GLOBAL(0xEE7884, paint_struct*);
 	paint_struct* previous_ps = ps->var_24;
@@ -885,13 +867,8 @@ void sub_0x69E8B0(uint16 eax, uint16 ecx){
 		case SPRITE_IDENTIFIER_LITTER:
 			RCT2_CALLPROC_X(0x6736FC, eax, ebx, ecx, edx, (int)spr, (int)dpi, ebp);
 			break;
-			//I am pretty sure there are no other sprite identifier types
 		}
-		//RCT2_CALLPROC_X(RCT2_ADDRESS(0x98BC40,uint32)[spr->unknown.sprite_identifier], eax, ebx, ecx, edx, (int)spr, (int)dpi, ebp);
 	}
-
-	//RCT2_CALLPROC_X(0x69E8B0, _eax, 0, _ecx, 0, 0, 0, 0);
-	//return;
 }
 
 /*rct2: 0x006C42D9*/
@@ -1519,8 +1496,6 @@ void sub_688217()
  *  ebp: bottom
  */
 void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, int top, int right, int bottom){
-	//RCT2_CALLPROC_X(0x00685CBF, left, top, 0, right, (int)viewport, (int)dpi, bottom);
-	//return;
 	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint16) = viewport->flags;
 	RCT2_GLOBAL(RCT2_ADDRESS_VIEWPORT_ZOOM, uint16) = viewport->zoom;
 
@@ -1600,11 +1575,8 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
 		int ebp = 0, ebx = 0, esi = 0, ecx = 0;
 		sub_0x68615B(0xEE788C); //Memory copy
 		sub_0x68B6C2();
-		//RCT2_CALLPROC_X(0x68B6C2, 0, 0, 0, 0, 0, 0, 0); //Big function call 4 rotation versions
 		sub_688217();
-		//RCT2_CALLPROC_X(0x688217, start_x, ebx, ecx, (int)bits_pointer, esi, (int)dpi2, ebp); //Move memory
 		sub_688485();
-		//RCT2_CALLPROC_EBPSAFE(0x688485); //Big function call
 
 		int weather_colour = RCT2_ADDRESS(0x98195C, uint32)[RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_WEATHER_GLOOM, uint8)];
 		if ((weather_colour != -1) && (!(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint16) & 0x4000)) && (!(RCT2_GLOBAL(0x9DEA6F, uint8) & 1))){
@@ -1612,8 +1584,6 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
 		}
 		RCT2_CALLPROC_EBPSAFE(0x6860C3); //string related
 	}
-
-	//RCT2_CALLPROC_X(0x00685CBF, left, top, 0, right, (int)viewport, (int)dpi, bottom);
 }
 
 /**
diff --git a/src/localisation/localisation.c b/src/localisation/localisation.c
index f057532a4f..182aefedc0 100644
--- a/src/localisation/localisation.c
+++ b/src/localisation/localisation.c
@@ -651,7 +651,6 @@ void format_string_part(char **dest, rct_string_id format, char **args)
  */
 void format_string(char *dest, rct_string_id format, void *args)
 {
-	// RCT2_CALLPROC_X(0x006C2555, format, 0, (int)args, 0, 0, (int)dest, 0);
 	format_string_part(&dest, format, (char**)&args);
 }
 
@@ -666,7 +665,6 @@ void format_string_raw(char *dest, char *src, void *args)
  *  format (bx)
  */
 void error_string_quit(int error, rct_string_id format){
-	//RCT2_CALLPROC_X(0x006E37F7, error, format, 0, 0, 0, 0, 0);
 	RCT2_GLOBAL(0x14241A0, uint32) = error;
 	RCT2_GLOBAL(0x9E2DA0, uint32) = 1;
 
diff --git a/src/object.c b/src/object.c
index ca77dfe2c9..0f83bab287 100644
--- a/src/object.c
+++ b/src/object.c
@@ -1460,7 +1460,6 @@ int paint_stex_entry(int flags, int ebx, int ecx, int edx, rct_drawpixelinfo* dp
 
 int object_paint(int type, int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp)
 {
-	//return RCT2_CALLPROC_X(RCT2_ADDRESS(0x0098D9D4, uint32)[type], eax, ebx, ecx, edx, esi, edi, ebp) & 0x100;
 	switch (type)
 	{
 	case OBJECT_TYPE_RIDE:
@@ -1497,8 +1496,6 @@ int object_paint(int type, int eax, int ebx, int ecx, int edx, int esi, int edi,
  */
 int object_get_scenario_text(rct_object_entry *entry)
 {
-	// RCT2_CALLPROC_X(0x006A9428, 0, 0, 0, 0, 0, 0, (int)entry); return;
-
 	rct_object_entry *installedObject = RCT2_GLOBAL(RCT2_ADDRESS_INSTALLED_OBJECT_LIST, rct_object_entry*);
 
 	installedObject = object_list_find(entry);
diff --git a/src/peep/peep.c b/src/peep/peep.c
index eb9f257a9c..6bd095f73c 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -568,9 +568,6 @@ void peep_window_state_update(rct_peep* peep){
 
 /* rct2: 0x0069A535*/
 void peep_sprite_remove(rct_peep* peep){
-	//RCT2_CALLPROC_X(0x69A535, 0, 0, 0, 0, (int)peep, 0, 0);
-	//return;
-
 	remove_peep_from_ride(peep);
 	invalidate_sprite((rct_sprite*)peep);
 
@@ -622,7 +619,6 @@ void peep_update_falling(rct_peep* peep){
 		sint16 x, y, xy_distance;
 
 		peep_update_action(&x, &y, &xy_distance, peep);
-		//RCT2_CALLPROC_X(0x6939EB, 0, 0, 0, 0, (int)peep, 0, 0);
 		if (peep->action == PEEP_ACTION_DROWNING) return;
 		if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & 0x80000)){
 			RCT2_GLOBAL(0x13CE952, uint16) = peep->name_string_idx;
@@ -780,7 +776,6 @@ void peep_update_sitting(rct_peep* peep){
 		if (peep->action < 0xFE){
 			sint16 x, y, xy_distance;
 			peep_update_action(&x, &y, &xy_distance, peep);
-			//RCT2_CALLPROC_X(0x6939EB, 0, 0, 0, 0, (int)peep, 0, 0);
 			if (peep->action != 0xFF) return;
 
 			peep->action = 0xFE;
@@ -3317,9 +3312,6 @@ static void peep_update_walking_break_scenery(rct_peep* peep){
 /* rct2: 0x006912A3 */
 static void peep_update_buying(rct_peep* peep)
 {
-	//RCT2_CALLPROC_X(0x006912A3, 0, 0, 0, 0, (int)peep, 0, 0);
-	//return;
-
 	if (!sub_68F3AE(peep))return;
 	
 	rct_ride* ride = GET_RIDE(peep->current_ride);
@@ -3413,8 +3405,6 @@ static void peep_update_buying(rct_peep* peep)
 
 /* rct2: 0x00691089 */
 static void peep_update_using_bin(rct_peep* peep){
-	//RCT2_CALLPROC_X(0x0691089, 0, 0, 0, 0, peep, 0, 0);
-	//return;
 	if (peep->sub_state == 0){
 		if (!sub_68F3AE(peep))return;
 
@@ -3544,8 +3534,6 @@ static void peep_update_using_bin(rct_peep* peep){
 
 /* rct2: 0x006C16D7 */
 static void peep_update_heading_to_inspect(rct_peep* peep){
-	//RCT2_CALLPROC_X(0x006C16D7, 0, 0, 0, 0, (int)peep, 0, 0);
-	//return;
 	rct_ride* ride = GET_RIDE(peep->current_ride);
 
 	if (ride->type == RIDE_TYPE_NULL){
@@ -3652,8 +3640,6 @@ static void peep_update_heading_to_inspect(rct_peep* peep){
 
 /* rct2: 0x006C0CB8 */
 static void peep_update_answering(rct_peep* peep){
-	//RCT2_CALLPROC_X(0x006C0CB8, 0, 0, 0, 0, (int)peep, 0, 0);
-	//return;
 	rct_ride* ride = GET_RIDE(peep->current_ride);
 
 	if (ride->type == RIDE_TYPE_NULL || 
@@ -3979,9 +3965,6 @@ static void peep_update_patrolling(rct_peep* peep){
 
 /* rct2: 0x0069030A */
 static void peep_update_walking(rct_peep* peep){
-	//RCT2_CALLPROC_X(0x0069030A, 0, 0, 0, 0, (int)peep, 0, 0);
-	//return;
-
 	if (!sub_68F3AE(peep))return;
 
 	if (peep->flags & PEEP_FLAGS_WAVING){
@@ -4262,9 +4245,6 @@ static void peep_update_thoughts(rct_peep* peep){
  */
 static void peep_update(rct_peep *peep)
 {
-	//RCT2_CALLPROC_X(0x0068FC1E, 0, 0, 0, 0, (int)peep, 0, 0); return;
-	//return;
-
 	if (peep->type == PEEP_TYPE_GUEST) {
 		if (peep->previous_ride != 255)
 			if (++peep->previous_ride_time_out >= 720)
@@ -4292,8 +4272,6 @@ static void peep_update(rct_peep *peep)
 		RCT2_CALLPROC_X(0x0068FD3A, 0, 0, 0, 0, (int)peep, 0, 0);
 	} else {
 		// loc_68FD2F
-		//RCT2_CALLPROC_X(0x68FD2F, 0, 0, 0, 0, (int)peep, 0, 0);
-		//return;
 		switch (peep->state) {
 		case PEEP_STATE_FALLING:
 			peep_update_falling(peep);
@@ -4667,13 +4645,6 @@ void peep_update_days_in_queue()
  */
 rct_peep *peep_generate(int x, int y, int z)
 {
-	//int eax, ebx, ecx, _edx, esi, edi, ebp;
-	//eax = x;
-	//ecx = y;
-	//_edx = z;
-	//RCT2_CALLFUNC_X(0x0069A05D, &eax, &ebx, &ecx, &_edx, &esi, &edi, &ebp);
-	//return (rct_peep*)esi;
-
 	if (RCT2_GLOBAL(0x13573C8, uint16) < 400)
 		return NULL;
 
diff --git a/src/platform/shared.c b/src/platform/shared.c
index 3dfe15195d..6e2ea0cf26 100644
--- a/src/platform/shared.c
+++ b/src/platform/shared.c
@@ -522,7 +522,6 @@ void platform_init()
 	platform_create_window();
 	gKeysPressed = malloc(sizeof(unsigned char) * 256);
 	memset(gKeysPressed, 0, sizeof(unsigned char) * 256);
-	// RCT2_CALLPROC(0x00404584); // dinput_init()
 }
 
 static void platform_create_window()
diff --git a/src/rct2.c b/src/rct2.c
index 85186d1040..8f82758dcb 100644
--- a/src/rct2.c
+++ b/src/rct2.c
@@ -85,7 +85,6 @@ int rct2_init()
 	config_shortcut_keys_load();
 	RCT2_GLOBAL(RCT2_ADDRESS_PLACE_OBJECT_MODIFIER, uint8) = 0;
 	// config_load();
-	// RCT2_CALLPROC_EBPSAFE(0x00674B81); // pointless expansion pack crap
 
 	object_list_load();
 	scenario_load_list();
diff --git a/src/ride/ride.c b/src/ride/ride.c
index 4f34dc26d2..8c340cb58b 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -790,9 +790,6 @@ static void ride_remove_peeps(int rideIndex)
  */
 int sub_6C683D(int* x, int* y, int* z, int direction, int type, uint16 extra_params, rct_map_element** output_element, uint16 flags)
 {
-	//int ebx = (direction << 8) | type;
-	//return RCT2_CALLFUNC_X(0x006C683D, x, &ebx, y, &z, &esi, &edi, &ebp)&0x100;
-
 	rct_map_element* map_element = map_get_first_element_at(*x / 32, *y / 32);
 	rct_map_element* success_map = NULL;
 
@@ -1190,10 +1187,6 @@ int ride_modify(rct_xy_element *input)
 
 	sub_6C84CE();
 	return 1;
-
-	// Success stored in carry flag which can't be accessed after call using is macro
-	// RCT2_CALLPROC_X(0x006CC056, 0, 0, 0, (int)trackMapElement, 0, 0, 0);
-	// return 1;
 }
 
 /**
@@ -3338,8 +3331,6 @@ void sub_6B5952(int rideIndex)
  */
 int ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output)
 {
-	// return RCT2_CALLPROC_X(0x006D3319, x, 0, y, 0, (int)mapElement, 0, 0) & 0x100;
-
 	int rideIndex, type;
 	rct_xy_element trackElement, nextTrackElement;
 	rct_map_element *loopTrackElement;
diff --git a/src/ride/track.c b/src/ride/track.c
index d2ac2eeafa..df972c2ca3 100644
--- a/src/ride/track.c
+++ b/src/ride/track.c
@@ -462,7 +462,6 @@ void track_load_list(ride_list_item item)
 
 	track_list_populate(item, track_list_cache);
 	free(track_list_cache);
-    //RCT2_CALLPROC_X(0x006CED50, 0, 0, 0, *((uint16*)&item), 0, 0, 0);
 }
 
 static void read(void *dst, char **src, int length)
@@ -3099,7 +3098,6 @@ rct_track_design *temp_track_get_info(char* path, uint8** preview)
 		memcpy(&trackDesign->track_td6, loaded_track, sizeof(rct_track_td6));
 		// Load in a new preview image, calculate cost variable, calculate var_06
 		draw_track_preview((uint8**)trackDesign->preview);
-		//RCT2_CALLPROC_X(0x006D1EF0, 0, 0, 0, 0, 0, (int)&trackDesign->preview, 0);
 
 		trackDesign->track_td6.cost = RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_COST, money32);
 		trackDesign->track_td6.track_flags = RCT2_GLOBAL(0x00F44151, uint8) & 7;
diff --git a/src/scenario.c b/src/scenario.c
index b81d2be80c..28b9e97102 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -174,8 +174,6 @@ int scenario_load(const char *path)
 				set_load_objects_fail_reason();
 				return 0;
 			}
-			// Check expansion pack
-			// RCT2_CALLPROC_EBPSAFE(0x006757E6);
 
 			reset_loaded_objects();
 			map_update_tile_pointers();
diff --git a/src/title.c b/src/title.c
index 411ff5c612..b044c4148e 100644
--- a/src/title.c
+++ b/src/title.c
@@ -285,8 +285,6 @@ void title_update()
 	RCT2_GLOBAL(0x01388698, uint16)++;
 
 	// Input
-	// RCT2_CALLPROC_X(0x00667919, 1, 0, 0, 0, 0, 0, 0); // read_input(1)
-	// RCT2_CALLPROC_EBPSAFE(0x006EA627); // window_manager_handle_input();
 	game_handle_input();
 
 	update_palette_effects();
diff --git a/src/tutorial.c b/src/tutorial.c
index 5fc7972287..778cf47812 100644
--- a/src/tutorial.c
+++ b/src/tutorial.c
@@ -31,8 +31,6 @@ void tutorial_start(int type)
 {
 	strcpy((char*)0x009BC677, "Tutorial not implemented.");
 	window_error_open(3165, STR_NONE);
-
-	// RCT2_CALLPROC_X(0x0066ECC1, type, 0, 0, 0, 0, 0, 0);
 }
 
 /**
diff --git a/src/windows/editor_bottom_toolbar.c b/src/windows/editor_bottom_toolbar.c
index 8485ded736..6f235769bf 100644
--- a/src/windows/editor_bottom_toolbar.c
+++ b/src/windows/editor_bottom_toolbar.c
@@ -335,7 +335,6 @@ void window_editor_bottom_toolbar_jump_forward_to_save_scenario()
 	RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) = parkFlagsBackup;
 
 	if (success) {
-		// RCT2_CALLPROC_EBPSAFE(0x0066DC83);
 		title_load();
 	} else {
 		window_error_open(STR_SCENARIO_SAVE_FAILED, -1);
diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c
index 2e1b5296d8..de90fbf90b 100644
--- a/src/windows/editor_inventions_list.c
+++ b/src/windows/editor_inventions_list.c
@@ -353,8 +353,6 @@ static void research_items_shuffle()
 		researchOrderBase[i] = researchOrderBase[ri];
 		researchOrderBase[ri] = researchItemTemp;
 	}
-
-	// RCT2_CALLPROC_EBPSAFE(0x00685A93);
 }
 
 static void research_items_make_all_unresearched()
@@ -522,8 +520,6 @@ static rct_research_item *get_research_item_at(int x, int y)
  */
 void window_editor_inventions_list_open()
 {
-	// RCT2_CALLPROC_EBPSAFE(0x00684E04); return;
-
 	rct_window *w;
 
 	w = window_bring_to_front_by_class(WC_EDITOR_INVENTION_LIST);
diff --git a/src/windows/guest.c b/src/windows/guest.c
index 7550b5e114..5c8cce1cac 100644
--- a/src/windows/guest.c
+++ b/src/windows/guest.c
@@ -1106,11 +1106,9 @@ void window_guest_overview_update(rct_window* w){
 			if (rand <= 0x2AAA){
 				rct_peep* peep = GET_PEEP(w->number);
 				peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_WATCHED, 0xFF);
-				//RCT2_CALLPROC_X(0x699F5A, 0xFF00 | PEEP_THOUGHT_TYPE_WATCHED, 0, 0, 0, (int)peep, 0, 0);
 			}
 		}
 	}
-	
 }
 
 /* rct2:0x696A6A */
@@ -1368,8 +1366,6 @@ void window_guest_stats_invalidate(){
 *  ebp: colour, contains flag 0x80000000 for blinking
 */
 void window_guest_stats_bars_paint(int value, int x, int y, rct_window *w, rct_drawpixelinfo *dpi, int colour){
-	//RCT2_CALLPROC_X(0x6974FC, value, 0, x, y, (int)w, (int)dpi, colour);
-
 	value *= 0x76;
 	value >>= 8;
 
diff --git a/src/windows/guest_list.c b/src/windows/guest_list.c
index c10a0398fb..dc3466f961 100644
--- a/src/windows/guest_list.c
+++ b/src/windows/guest_list.c
@@ -189,8 +189,6 @@ void window_guest_list_open()
 */
 void window_guest_list_open_with_filter(int type, int index)
 {
-	//RCT2_CALLPROC_X(0x006993BA, type, ebx, 0, 0, 0, 0, 0);
-
 	uint32 eax, edx;
 
 	window_guest_list_open();
diff --git a/src/windows/map.c b/src/windows/map.c
index 1865f3bc11..89f4d643ff 100644
--- a/src/windows/map.c
+++ b/src/windows/map.c
@@ -237,7 +237,6 @@ void window_map_resize()
 */
 static void window_map_mouseup()
 {
-	//RCT2_CALLPROC_EBPSAFE(0x0068CFC1);
 	sint16 var_idx;
 	rct_window* var_w;
 	//Maximum land ownership tool size
@@ -762,9 +761,6 @@ static void window_map_transform_to_map_coords(sint16 *left, sint16 *top)
 */
 static void window_map_paint_peep_overlay(rct_drawpixelinfo *dpi)
 {
-	//RCT2_CALLPROC_X(0x68DADA, 0, 0, 0, 0, (int)w, (int)dpi, 0);	//draws dots representing guests
-	//return;
-
 	rct_peep *peep;
 	uint16 spriteIndex;
 
@@ -812,9 +808,6 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo *dpi)
 */
 static void window_map_paint_train_overlay(rct_drawpixelinfo *dpi)
 {
-	//RCT2_CALLPROC_X(0x68DBC1, 0, 0, 0, 0, (int)w, (int)dpi, 0);	//draws dots representing trains
-	//return;
-
 	rct_vehicle *train, *vehicle;
 	uint16 train_index, vehicle_index;
 
@@ -849,9 +842,6 @@ static void window_map_paint_train_overlay(rct_drawpixelinfo *dpi)
 */
 static void window_map_paint_hud_rectangle(rct_drawpixelinfo *dpi)
 {
-	//RCT2_CALLPROC_X(0x68D8CE, 0, 0, 0, 0, 0, (int)dpi, 0);
-	//return;
-
 	rct_window *main_window = window_get_main();
 	if (main_window == NULL)
 		return;
@@ -891,8 +881,6 @@ static void window_map_paint_hud_rectangle(rct_drawpixelinfo *dpi)
 */
 static void window_map_scrollpaint()
 {
-	//RCT2_CALLPROC_EBPSAFE(0x0068CF23);
-
 	rct_window *w;
 	rct_drawpixelinfo *dpi;
 	rct_g1_element *g1_element, pushed_g1_element;
diff --git a/src/windows/park.c b/src/windows/park.c
index f612960681..b6d5014334 100644
--- a/src/windows/park.c
+++ b/src/windows/park.c
@@ -710,10 +710,8 @@ static void window_park_entrance_mouseup()
 		break;
 	case WIDX_BUY_LAND_RIGHTS:
 		toggle_land_rights_window(w, WIDX_BUY_LAND_RIGHTS);
-		//RCT2_CALLPROC_X(0x006682F7, 0, 0, 0, widgetIndex, (int)w, 0, 0);
 		break;
-	//case WIDX_BUY_CONSTRUCTION_RIGHTS:
-	//	RCT2_CALLPROC_X(0x00668393, 0, 0, 0, widgetIndex, (int)w, 0, 0);
+	// case WIDX_BUY_CONSTRUCTION_RIGHTS:
 	//	break;
 	case WIDX_LOCATE:
 		window_scroll_to_viewport(w);
diff --git a/src/windows/ride.c b/src/windows/ride.c
index d4eefcaaca..ba2d5bee07 100644
--- a/src/windows/ride.c
+++ b/src/windows/ride.c
@@ -1113,8 +1113,6 @@ static void window_ride_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w)
 */
 void window_ride_disable_tabs(rct_window *w)
 {
-	//RCT2_CALLPROC_X(0x006AEB9F, 0, 0, 0, 0, (int)w, 0, 0);
-
 	uint32 disabled_tabs = 0;
 	rct_ride *ride = GET_RIDE(w->number & 0xFF);
 
@@ -5432,9 +5430,6 @@ static void window_ride_income_toggle_secondary_price(rct_window *w)
  */
 static void window_ride_income_increase_primary_price(rct_window *w)
 {
-	//RCT2_CALLPROC_X(0x006AE1E4, 0, 0, 0, 0, (int)w, 0, 0);
-	//ebp w->number
-	//eax ride->subtype
 	rct_ride *ride;
 	rct_ride_type *ride_type;
 
@@ -5460,8 +5455,6 @@ static void window_ride_income_increase_primary_price(rct_window *w)
  */
 static void window_ride_income_decrease_primary_price(rct_window *w)
 {
-	//RCT2_CALLPROC_X(0x006AE237, 0, 0, 0, 0, (int)w, 0, 0);
-
 	rct_ride *ride;
 	rct_ride_type *ride_type;
 
@@ -5487,8 +5480,6 @@ static void window_ride_income_decrease_primary_price(rct_window *w)
  */
 static void window_ride_income_increase_secondary_price(rct_window *w)
 {
-	//RCT2_CALLPROC_X(0x006AE269, 0, 0, 0, 0, (int)w, 0, 0);
-	
 	rct_ride *ride;
 	rct_ride_type *ride_type;
 
@@ -5514,8 +5505,6 @@ static void window_ride_income_increase_secondary_price(rct_window *w)
  */
 static void window_ride_income_decrease_secondary_price(rct_window *w)
 {
-	//RCT2_CALLPROC_X(0x006AE28D, 0, 0, 0, 0, (int)w, 0, 0);
-
 	rct_ride *ride;
 	rct_ride_type *ride_type;
 
diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c
index 1823a2151c..2c64fe1881 100644
--- a/src/windows/ride_construction.c
+++ b/src/windows/ride_construction.c
@@ -126,10 +126,6 @@ static void* window_construction_events[] = {
  */
 rct_window *window_construction_open()
 {
-	//int eax, ebx, ecx, edx, esi, edi, ebp;
-	//RCT2_CALLFUNC_X(0x006CB481, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
-	//return (rct_window*)esi;
-
 	int ride_id = RCT2_GLOBAL(0xF440A7, uint8);
 	sub_6b2fa9(ride_id);
 
diff --git a/src/windows/staff.c b/src/windows/staff.c
index 792c434cfe..fea192a8b3 100644
--- a/src/windows/staff.c
+++ b/src/windows/staff.c
@@ -1243,8 +1243,6 @@ void window_staff_overview_viewport_init_wrapper(){
 
 /* rct2: 0x006BEDA3 */
 void window_staff_viewport_init(rct_window* w){
-	//RCT2_CALLPROC_X(0x006BEDA3, 0, 0, 0, 0, (int)w, 0, 0);
-
 	if (w->page != WINDOW_STAFF_OVERVIEW) return;
 
 	sprite_focus focus;
diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c
index ed11845752..bfca885567 100644
--- a/src/windows/top_toolbar.c
+++ b/src/windows/top_toolbar.c
@@ -433,7 +433,6 @@ static void window_top_toolbar_dropdown()
 			break;
 		case DDIDX_SAVE_GAME:
 			if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR) {
-				// RCT2_CALLPROC_EBPSAFE(0x0066FE2A);
 				rct_s6_info *s6Info = (rct_s6_info*)0x0141F570;
 				window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_LANDSCAPE, s6Info->name);
 			} else {
@@ -722,8 +721,6 @@ static void window_top_toolbar_paint()
 
 /* rct2: 0x006E3158 */
 static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){
-	//RCT2_CALLPROC_X(0x6E2CC6, x, y, 0, widgetIndex, 0, 0, 0);
-	//return;
 	// ax, cx, bl
 	sint16 grid_x, grid_y;
 	int type;
@@ -2547,8 +2544,6 @@ money32 selection_lower_land(uint8 flags){
 */
 void window_top_toolbar_land_tool_drag(short x, short y)
 {
-	//RCT2_CALLPROC_X(0x00664454, x, y, 0, widgetIndex, (int)w, 0, 0);
-
 	rct_window *window = window_find_from_point(x, y);
 	if (!window)
 		return;
@@ -2594,8 +2589,6 @@ void window_top_toolbar_land_tool_drag(short x, short y)
 */
 void window_top_toolbar_water_tool_drag(short x, short y)
 {
-	//RCT2_CALLPROC_X(0x006E6D4B, x, y, 0, widgetIndex, (int)w, 0, 0);
-
 	rct_window *window = window_find_from_point(x, y);
 	if (!window)
 		return;
diff --git a/src/world/map.c b/src/world/map.c
index d364939c2c..60ecd9ba22 100644
--- a/src/world/map.c
+++ b/src/world/map.c
@@ -1411,9 +1411,6 @@ money32 map_change_surface_style(int x0, int y0, int x1, int y1, uint8 surface_s
 
 /* rct2: 0x00663CCD */
 void game_command_change_surface_style(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp){
-	//RCT2_CALLFUNC_X(0x663CCD, eax, ebx, ecx, edx, esi, edi, ebp);
-	//return;
-
 	*ebx = map_change_surface_style(
 		(*eax & 0xFFFF),
 		(*ecx & 0xFFFF),