Cleaned up non-functioning code.