Removed obsolete code. Removed simulation related code. Did not change runtime or code gneration