Revert "Added code to make things compile"

This reverts commit 703887e0a4d34b84f35707365e8b993dae3a3063.