Intellisense changes and some cleanup