[DEV 0.2.12] Cleanup of 0.2.11 Fix

Cleaned up code for the bug fixed in 0.2.11

Mainly useless code removal.