Final changes and cleanup