Cleanups and start adding support for custom profiles