Cleanup: remove unnecessary pseudo variable declarations
Cleanup: remove defunct code after consultation with author